$webwork.htmlEncode($page.space.name) : 3 Merge Procedure
This page last changed on Oct 24, 2006 by cholmes.
Chris Holmes sent me the following summary:
And here is a link to daves email: I will splice sections of dave's email into each section. So lets see what we can figure out from this email? To start with it was Many of the other points are still valid - lets go through them. Guidelines and Ground RulesDon't break the build!I know that this is open source common sense, but some important issues were highlighted:
In short if your changes slow us down they will be rolled back, unit tests must be fast or they are will not be run (and are thus broken).
In fact, the only time I do a full geoserver build is when I modify the .jsp file or deploy a new configuration (and if I did the latter more often I'd have an ant task to just refresh the .jsps in the deployed server). 10 minutes is forever. If I do that 6 times, it means that I've wasted an entire hour. I hate being that unproductive. Don't break the documentation!This makes sense, if you change the code or design update the documentation to match. You cannot expect others to learn the system if the documentation does not match what is in svn.
This requirement is not to scary unless you are doing scary work. It is too bad that the 1.4.x branch is setting up a framework and thus actually needs to worry about this issues. For most projects this will be a non issue. Here is how you can get that done:
Note if you need to modify existing pages on GEOSDOC you will need hack at a copy in GEOSDEV:
Dave on Documentation Requirement
If it isnt updated, then we have two other major problems:
Jody on 1.4.x docs To accomplish this we need to ensure that a Wiki is available where the docs can be updated as part of the merge process. We tried to get a "copy" of the GeoServer 1.3 documentation made as a starting point but were unsuccessful.
While we could update the existing Home documentation directly this would impact users already using the stable branch (of course they could/should make use of the export of this documentation included in their release). We need wiki space to create docs for 1.4.x without having to prepend 1.4.x to every page in order to not step on the toes of 1.3.x. GEOSDEV seems to be the place to do this. I plan to import the relevant docs from GEOSDOC (architecture docs, articles new architecture, etc..), and the previous version of the 1.4.x developers guide which is being updated. No one night stands (Maintence)This is about commitment, and you thought commit access was enough. Seriously the maintence questions is a big one, we cannot
If we cannot maintain your code we cannot accept it, if you have a plan to keep it going that of course changes everything.
Community and CommunicationDave mentioned checking with "the raster people", this is an example of "communication" to keep the geoserver community ticking along. Communication happens via email, and via some IRC meetings. Please ask, be aware, and develop your RnD work in a public manner so you can be sure that your changes do not negativly effect the happiness of others.
Copyright and WrongWe do need an IP check, at a minium TOPP uses the GPL license to protect itself, in addition TOPP also owns copyright and
While we start in good faith we will be forced to turf any changes that cannot meet these requirements. Release Early Release OftenAfter you have done your merge, stick out a release. While this is overhead it does ensure that you have not broken anything
If milestone releases happen too often (say once a week) we can go to a monthly schedule, or you can negotiate with another team and join up Quality and AssurancesThis is a hard one, GeoServer needs to meet the following guidelines to "be geoserver".
|
![]() |
Document generated by Confluence on Jan 16, 2008 23:26 |